Manual merge of version 8.0.6+dfsg-1+rpi1 and 9.0.2+dfsg-1 to produce 9.0.2+dfsg...

diff --cc bitmap2component/CMakeLists.txt
index c0743e97e1ce821085e7b779879fa519ab90a677,40d927dfd948907eaebc6359f3d595ee1b7e54f9..99446cf9f75a7baad00cb30b2db986c3986f512e
--- 1/bitmap2component/CMakeLists.txt
--- 2/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@@ -52,9 -52,9 +52,10 @@@ add_executable( bitmap2component WIN32 
  
  target_link_libraries( bitmap2component
      common
+     kicommon
      ${wxWidgets_LIBRARIES}
      potrace
 +    atomic
      )
  
  if( APPLE )

diff --cc debian/changelog
index 87d2624fda64b3eefb76e6271d1135afe314615b,0e82a314ec82601107219aca0e31fea3acb47d47..5cf678a0373faf98bedffa62aa8923b91e696635
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,72 +1,80 @@@
- kicad (8.0.6+dfsg-1+rpi1) trixie-staging; urgency=medium
++kicad (9.0.2+dfsg-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 6.0.0+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 09 Jan 2022 17:43:33 +0000]
 +  * Link with libatomic.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 26 Oct 2024 23:26:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 30 May 2025 10:05:34 +0000
++
+ kicad (9.0.2+dfsg-1) unstable; urgency=medium
+ 
+   * [2c5aa4f] New upstream version 9.0.2+dfsg
+   * [1e1cda8] d/copyright: Replace old FSF address with URL
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 10 May 2025 11:34:36 +0200
+ 
+ kicad (9.0.1+dfsg-1) unstable; urgency=medium
+ 
+   [ Carsten Schoenert ]
+   * [23d6e54] New upstream version 9.0.1+dfsg
+   * [3682fc3] d/control: Increase Standards-Version to 4.7.2
+     + No further changes needed.
+   * [3f344b9] d/kicad-demos.install: Add new subfolder to install
+ 
+   [ RICCIARDI-Adrien ]
+   * [1c64540] Rebuild patch queue from patch-queue branch
+     + Updated patch:
+       fixes/Adjusting-content-in-the-desktop-files.patch
+       See also
+       https://salsa.debian.org/electronics-team/KiCad/kicad/-/merge_requests/2
+ 
+   [ John Paul Adrian Glaubitz ]
+   * [5f03e00] d/rules: Add needed linking for armel m68k powerpc sh4
+     (Closes: #1098791)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 04 Apr 2025 16:07:28 +0200
+ 
+ kicad (9.0.0+dfsg-1) unstable; urgency=medium
+ 
+   * [90a9b14] d/gbp.conf: Filter out one more PDF file
+   * [a4131fc] New upstream version 9.0.0+dfsg
+     (Closes: #1098475)
+   * [651264e] d/control: Add new needed Build-Deps
+   * [46e8aec] d/kicad.install.in: Add libkiapi to sequencer
+   * [80f8e81] d/rules: Add new CMAKE option to DEB_KICAD_CMAKE_OPTS
+   * [5341af1] d/s/lintian-overrides: Ignore non relevant Lintian detection
+   * [f2b0e1a] d/copyright: Update copyright information
+   * [39aae5e] d/kicad.lintian-overrides: Adjust content due changes
+   * [f3a620c] d/README.vendorded-stuff: Some more notes
+   * [83f540d] d/rules: Remove more unwanted files in kicad-demos
+   * [c50fcfa] d/rules: Use upper case, not one char variable names
+   * [3104e18] d/control: Increase Standards-Version to 4.7.1
+     + No further changes needed.
+   * [b04b0d0] d/control: Bump Bre/Sug/Rec versions to >=/<< 9.0.0~
+   * [5069e37] d/t/control: Sort entries by wrap-and-sort
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 23 Feb 2025 17:00:42 +0200
+ 
+ kicad (8.0.8+dfsg-1) unstable; urgency=medium
+ 
+   * [414e014] New upstream version 8.0.8+dfsg
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 12 Jan 2025 10:43:51 +0200
+ 
+ kicad (8.0.7+dfsg-2) unstable; urgency=medium
+ 
+   * [7ee0ffc] d/rules: Ignore dh_dwz on armhf
+     This architecture is providing too less memory dwz could be running
+     succesfully.
+     (Closes: #1091284)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 26 Dec 2024 11:30:34 +0200
+ 
+ kicad (8.0.7+dfsg-1) unstable; urgency=medium
+ 
+   * [b0daff1] New upstream version 8.0.7+dfsg
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 24 Dec 2024 13:46:07 +0200
  
  kicad (8.0.6+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
index e855577d0605d0bf3bdebaa24b03d966854370d7,3ed21db6795a481a67046ca7457ffa4a59a22119..ba0ed81451ddba4dda5a461c711fd87a676a8671
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -9,6 -9,11 +9,11 @@@ include /usr/share/dpkg/buildflags.m
  CFLAGS+=$(CPPFLAGS)
  CXXFLAGS+=$(CPPFLAGS)
  
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k powerpc sh4))
+ # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
++ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k powerpc sh4))
+     export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
+ endif
+ 
  # out of tree build folder for kicad application
  DEB_BUILD_DIR=debian/build
  # default install folder
@@@ -157,12 -163,8 +164,18 @@@ override_dh_makeshlibs
                -Xlibs3d_plugin_vrml \
                -X_pcbnew.$(DEB_HOST_MULTIARCH)
  
 +PLAIN_UPSTREAM_VERSION=$(word 1,$(subst +, ,$(DEB_VERSION)))
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -rf $(DEB_BUILD_DIR)
 +      -sed -i 's/^set( KICAD_SEMANTIC_VERSION.*/set( KICAD_SEMANTIC_VERSION "$(PLAIN_UPSTREAM_VERSION)" )/g' CMakeModules/KiCadVersion.cmake
 +      -sed -i 's/^:revdate: .*/:revdate: @REVDATE@/g' `find . -name '*.adoc'`
 +      rm -f eeschema/sch_text_help_md.h pcbnew/dialogs/panel_setup_rules_help_md.h
 +      rm -f bitmaps_png/icons/kicad.xpm
++
+ override_dh_dwz:
+ # dh_dwz is running out of memory on armhf, see #1091284
+ ifneq ($(DEB_BUILD_ARCH),armhf)
+       dh_dwz
+ endif

diff --cc eeschema/CMakeLists.txt
index 419fe66b9e340b04bd17b02a5753e2f4a64ba35f,8b38c7e22928b6eedfd06d87bf765ae5682e4b49..776fd8fe9dd4fb52695a89bd5bc80a12327671c1
--- 1/eeschema/CMakeLists.txt
--- 2/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@@ -519,18 -562,10 +562,11 @@@ add_executable( eeschema WIN32 MACOSX_B
  set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
      COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"kicad_sch\";BUILD_KIWAY_DLL"
      )
+ 
  target_link_libraries( eeschema
-     #singletop  # replaces common, giving us restrictive control and link warnings.
-     # There's way too much crap coming in from common yet.
-     gal
-     common
-     argparse::argparse
+     kicommon
      ${wxWidgets_LIBRARIES}
 +    -latomic
      )
  
  # the main Eeschema program, in DSO form.

diff --cc kicad/CMakeLists.txt
index 8d5dc07c68838647955fcdf791096aec3fd4f11d,9d001ef2e69b3d84be7376c59ceea50c79424d42..10f8b22fed7bbc74a209bcda19d17feb56805f4f
--- 1/kicad/CMakeLists.txt
--- 2/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@@ -147,9 -169,9 +169,10 @@@ else(
          common
          gal
          common      #repeated due to a circular dependency between gal and common
+         kicommon
          core
          ${wxWidgets_LIBRARIES}
 +        -latomic
          )
  
      target_link_libraries( kicad-cli

diff --cc qa/tests/eeschema/CMakeLists.txt
Simple merge

diff --cc qa/tests/gerbview/CMakeLists.txt
Simple merge

diff --cc qa/tests/pcbnew/CMakeLists.txt
Simple merge

diff --cc qa/tests/spice/CMakeLists.txt
Simple merge